Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More test fixes #4235

Merged
merged 3 commits into from
May 8, 2017
Merged

More test fixes #4235

merged 3 commits into from
May 8, 2017

Conversation

andrewkroh
Copy link
Member

@andrewkroh andrewkroh commented May 5, 2017

A follow up to #4216 to fix some more tests on Windows.

These are the failures being addressed (except the Filebeat ones, those need specialized attention): https://beats-ci.elastic.co/job/elastic+beats+master+tests-windows/4/testReport/

  • Using single quotes around Windows paths e86d38b

    The thrift test config used double quotes around Windows path separators and this was interpreted incorrectly in YAML parsing.

  • Use logp.Beta or logp.Experimental in metricsets 077d508

    And in system tests, centralize the logic for asserting that there are no ERR or WARN in logs.

    Filter out errors about “The service process could not connect to the service controller” that occur when testing on Jenkins where Jenkins itself is running as a service. This confuses the Beat because it thinks that it is running as service, but it’s not.

  • Rename TestBadCondition to TestConditions ab84099

    This test doesn’t actually test any bad conditions. Plus there is another test in the same directory with the name TestBadCondition.

@monicasarbu monicasarbu added the Metricbeat Metricbeat label May 7, 2017
Copy link
Contributor

@ruflin ruflin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Should I rebase merge to keep the commits or do you want to squash them?

Assert that the log file contains no ERR or WARN lines.
"""
log = self.get_log()
log = log.replace("WARN EXPERIMENTAL", "")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice

@andrewkroh
Copy link
Member Author

Let me fix it up to get it back to the three separate commits. Then you can use "rebase and merge".

andrewkroh added 3 commits May 8, 2017 10:22
The thrift test config used double quotes around Windows path separators and this was interpreted incorrectly in YAML parsing.
And in system tests, centralize the logic for asserting that there are no ERR or WARN in logs.

Filter out errors about “The service process could not connect to the service controller” that occur when testing on Jenkins where Jenkins itself is running as a service. This confuses the Beat because it thinks that it is running as service, but it’s not.
This test doesn’t actually test any bad conditions. Plus there is another test in the same directory with the name TestBadCondition.
@andrewkroh andrewkroh force-pushed the bugfix/windows-tests branch from b22f00c to ab84099 Compare May 8, 2017 14:22
@ruflin ruflin merged commit 8984f1c into elastic:master May 8, 2017
@andrewkroh andrewkroh deleted the bugfix/windows-tests branch July 5, 2017 19:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants